Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <[email protected]>
Thu, 1 Dec 2016 14:24:02 +0000 (09:24 -0500)
committerTom Rini <[email protected]>
Thu, 1 Dec 2016 14:24:02 +0000 (09:24 -0500)

Trivial merge